settings: Convert to GdkEvent API

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4364e795141ccd8b1651f97063849c8ba7455d9a..d9411d5fce9895700e35c10afd6f7ba2db820f6d 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1613,7 +1613,7 @@ gtk_main_do_event (GdkEvent *event)
 
   if (event->type == GDK_SETTING)
     {
-      _gtk_settings_handle_event (&event->setting);
+      _gtk_settings_handle_event (event);
       return;
     }
 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 3bdb863eaf39cec0789fafeeed3ea96a8b2c92ab..e2b5d43ff386e1ab567df46844ea604a08d196b6 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -2009,15 +2009,20 @@ gtk_rc_property_parse_border (const GParamSpec *pspec,
 }
 
 void
-_gtk_settings_handle_event (GdkEventSetting *event)
+_gtk_settings_handle_event (GdkEvent *event)
 {
   GdkScreen *screen;
   GtkSettings *settings;
   GParamSpec *pspec;
+  const char *name;
 
-  screen = gdk_window_get_screen (event->window);
+  screen = gdk_window_get_screen (gdk_event_get_window (event));
   settings = gtk_settings_get_for_screen (screen);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), event->name);
+
+  if (!gdk_event_get_setting (event, &name))
+    return;
+
+  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), name);
 
   if (!pspec)
     return;

diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h
index 1b1006e5d1c388485c52fd69107a2f4b9926e5d8..aaa06b69d816d11ebf7091094bdbd5d1cae06309 100644 (file)
--- a/gtk/gtksettingsprivate.h
+++ b/gtk/gtksettingsprivate.h
@@ -31,7 +31,7 @@ void                _gtk_settings_set_property_value_from_rc (GtkSettings
                                                               const GtkSettingsValue *svalue);
 void                _gtk_settings_reset_rc_values            (GtkSettings            *settings);
 
-void                _gtk_settings_handle_event               (GdkEventSetting        *event);
+void                _gtk_settings_handle_event               (GdkEvent               *event);
 GtkRcPropertyParser _gtk_rc_property_parser_from_type        (GType                   type);
 gboolean            _gtk_settings_parse_convert              (GtkRcPropertyParser     parser,
                                                               const GValue           *src_value,